Autogenerated HTML docs for v1.2.4-gb0a3de4
diff --git a/git-rebase.txt b/git-rebase.txt index b36276c..4a7e67a 100644 --- a/git-rebase.txt +++ b/git-rebase.txt
@@ -48,6 +48,18 @@ / D---E---F---G master +In case of conflict, git-rebase will stop at the first problematic commit +and leave conflict markers in the tree. After resolving the conflict manually +and updating the index with the desired resolution, you can continue the +rebasing process with + + git am --resolved --3way + +Alternatively, you can undo the git-rebase with + + git reset --hard ORIG_HEAD + rm -r .dotest + OPTIONS ------- <newbase>::
